Merge from emacs-24; up to r107994
authorChong Yidong <cyd@gnu.org>
Mon, 14 May 2012 11:59:28 +0000 (19:59 +0800)
committerChong Yidong <cyd@gnu.org>
Mon, 14 May 2012 11:59:28 +0000 (19:59 +0800)
commit09a3d966ed035b78750cd2cbd67c3063dfbb08a6
tree2a7171b49c1ae733805355fe8a699e31536daede
parentec09e5fdf15a1a61bb826cab9dc019f5db8e539e
parentd941810674b52914b194bda70572c832ec054fbd
Merge from emacs-24; up to r107994
doc/misc/ChangeLog
doc/misc/Makefile.in
lisp/ChangeLog
src/ChangeLog
src/xdisp.c